From 3e764309ad16b101bf7d50c8244dca66029e220f Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xensource.com>
Date: Tue, 3 Jul 2007 10:30:15 +0100
Subject: [PATCH] [32on64 kexec] Add an explicit local branch after re-enabling
 paging in 32 bit mode.

While it doesn't appear to be strictly required the documentation
calls for it. Thanks to Edwin Zhai for bringing the omission to my
attention.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
---
 xen/arch/x86/x86_64/compat_kexec.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/arch/x86/x86_64/compat_kexec.S b/xen/arch/x86/x86_64/compat_kexec.S
index 54b51437f8..da3136f886 100644
--- a/xen/arch/x86/x86_64/compat_kexec.S
+++ b/xen/arch/x86/x86_64/compat_kexec.S
@@ -144,6 +144,8 @@ compatibility_mode:
         movl %cr0, %eax
         orl $X86_CR0_PG, %eax
         movl %eax, %cr0
+        jmp 1f
+1:
 
         popl %eax
         call *%eax
-- 
2.30.2